Merge "Fix NPE" into sc-v2-dev