Merge formatting fixes from Wip/framework base/alpha pre