tests for #461
fix #461
fix #444
fix #443
Merge branch 'master' into destructure2