Layout issues fixed
Merge branch 'DDB-NEXT-prerelease_fix' into develop