Merge "Convert NULL to nullptr"