Merge "Merge "Ignore variable sized type not at end warning." am: 32e84facc2" into main-16k