Bugfix for import from CV-partner
Merge master to staging for version team city build 1.0.182