[#60460698] preparing for transition to ARC