Merge commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1' * commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1': Fix NPE at boot.