Merge "Change user configurable booting init"