Merge "Fix async behavior and address possible race conditions." into sc-dev