Start of work to get both root and non-root versions building in the same branch/project