<DA-314> fix margins
<unstable> Merge branch 'DA-314' into unstable