Merge pull request #21926 from colemanw/fixCrmCoreMenu