Merge "Add in required properties for boot of SO" into staging