Merge "Fix an issue that caused an NPE" into sc-v2-dev