Merge "Extract out inner classes from IMMS" into main