Merge "Fix padding resolution" into klp-dev