Merge "Refactor getBootUserUnchecked() to extract a couple of methods" into main