Merge branch 'nikitakit_smoothbline' into nikitakit_ducks