Issue GIT-15 pull request to release-15

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