Merge "Fix Sim Setting OOB error." into lmp-mr1-dev