Merge "Cleanup: use nullptr instead of NULL" into sc-dev