Issue #2141643:Applying changes suggested by coder