Merge "Fix an NPE" into sc-dev