Changed hasproperobjects back
Merge branch 'hasProperObjects'