Merge branch 'hotfix/4858'

Close #4858
moved description of "virtual" methods up into the class doc block so IDE's can autocomplete for them
Merge branch 'hotfix/4859' into develop

Forward port #4859