case-3407 - Margins fixes
Merge branch 'case-3407' into development