Merge "Fix intermittent async noteOps" into sc-dev