Further changes for the new Object Structure
Merge remote-tracking branch 'origin/sw.nohom.hybrid' into sw.nohom.hybrid