tests for #445
fix #445
Merge branch 'master' into spec-1119
Merge branch 'master' into spec-1119