Merge "OPS_MIC refactoring" into main