Issue GIT-3 pull request to release-15

Pull request for issue GIT-3 from branch GIT-3 to release-15