Issue GIT-21 pull request to master

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