Issue GIT-10 pull request to release-13

Pull request for issue GIT-10 from branch GIT-10 to release-13
lalala