Issue GIT-14 pull request to release-15

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