Merge "Replace remaining "subtypeId" with "subtypeIndex"" into main