Merge "Fix enable-exclusive atomic api" into sc-dev