Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev