CON-1788 | CR fixes, reimplementing paddings