Introduce osc_compat so multi org can still use osc_compat