(@ #697) Commited object and layout
Merge branch 'task697'