=act #3634, #3796 Fixing errors in code comments
Merge pull request #1903 from drexin/wip-3624-drexin

=act #3634, #3796 Fixing errors in code comments