Merge "Fix race condition issue for approval status" into sc-dev