Resolves #4708 - coding standards.