Merge "Fix race condition" into lmp-dev