Issue GIT-5 pull request to release-13

Pull request for issue GIT-5 from branch GIT-5 to release-13