Merge "Fix isAtLeastS failed on SCV2 and master" into sc-v2-dev