Merge pull request #6344 from DieHertz/bfdev-diehertz-fix-micros-race-condition