Merge "Fixed a SimSettings issue" into lmp-mr1-dev