Issue #3496505: Fixing coding standards issues on ported code, and other minor issues detected in project.
Closes #3496505