Merge "m framework-minus-apex should not build services" into main