Issue GIT-16 pull request to master

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