Issue GIT-8 pull request to master

Pull request for issue GIT-8 from branch GIT-8 to master