Issue GIT-24 pull request to release-13

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