fixes #1240
fixes #1211
Merge branch '1211_objdictcheck' into next
Merge branch 'next' into sam_1051