Merge "Fix isAtLeastS failed on SCV2 and master"