Merge "Setup correct initial guest restrictions" into lmp-dev