Merge "Modernize codebase by replacing NULL with nullptr"