Merge "Remove unnecessary null check to make code consistent" into sc-v2-dev