Merge "Fixed a NPE during setup wizard" into lmp-dev