Merge branch 'nikitakit_ducks'