fixes #1211
Merge branch '1211_objdictcheck' into next