Issue GIT-9 pull request to release-123

Pull request for issue GIT-9 from branch GIT-9 to release-123