Merge "Fix issue #17632804: Add resource padding" into lmp-dev