BZ-10553 minot fixes
Merge remote-tracking branch 'refs/remotes/origin/master'
BZ-10553 major changes, integration of new layout