Issue GIT-23 pull request to master

Pull request for issue GIT-23 from branch GIT-23-ci to master