Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev