am 65ef2608: Merge "Fix a race condition with shift" into jb-mr1-dev

* commit '65ef26081b78f52960ad520f997b3e79dcbb8528':
  Fix a race condition with shift