Merge "Unit test for the padding change" into main