Issue GIT-22 pull request to release-18

Pull request for issue GIT-22 from branch GIT-22 to release-18