Regression test for #370
Fixing broken #453 regression test
Removing extraneous pluck
Merge branch 'next' into slava_370