Merge "[AWARE] Fix the disable aware order" into sc-dev