remove obsolete import.
Merge main repo.
Merge main repo.
fix for issue 647: Import incorrectly overwrites default cubes.
minor refactorings.
add missing groovy code
merge changesets from lodici
remove call to deprecated method