Merge commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67' * commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67': - make it ok to modify the accounts before boot
Merge commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67' * commit 'ab3996f2c6c7c6e3e18e11fa32dac5c5d546ea67': - make it ok to modify the accounts before boot