Merge pull request #9770 from mpg/move-all-core-3.6

[3.6] Move all-core and all-helpers to the framework