Merge "IMM: remove obsolete test-only flag" into main