fix #20893 and 20894
fix #20895
fix #20896
fix #20891
Merge pull request #318 from lvinken/capella-import-fixes

Capella import fixes