Merge "Remove -Wpadded warning" into integration