Merge pull request #2380 from null77/suppress-override-warnings

Suppress two override suggestion warnings.