object class updated (null pointer fix)
test scene updated
Merge commit
Another merge. Conflicts resolved.