PL-659 Fix padding to align on 4 byte boundary