Adds override keyword for override functions.
Merge pull request #4874 from dumganhar/develop

Adds override keyword for override functions.