Add test for #336
Update changelog
Merge branch 'master' into develop