Merge "Add overrides and switch to nullptr keyword for all files"