Added 2 overrides methods
Merge branch 'master' of d:\myrepositories\cert\src_rep