HEMERA-3417: Work in progress
Merge branch 'fix-layout-overlapping' into develop
HEMERA-3417: Test cases