ported hotfix manually to develop/feature branch