[#32068] Consolidate extension helper classes to CMS tree (Fix #2043)