Merge "Add boot profile support"