Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev