Merge "Fix/suppress potential nullptr dereference warnings."