Merge "Fix bug 4738084 - Padding calculation regression"