Fixes user-info
Fixes margins
Merge CDB-2709 into release/2.13.5