Merge "[Aware] Fix Aware nonconcurrency issue" into sc-dev