Merge "Fix concurrent access violation." into lmp-mr1-dev