Merge "Remove unintentinal early-returns in IMMS" into main