Merge "Startup arch - feature cleanup"