Merge branch 'feature/4.6-system-import' of https://github.com/Antare…

Merge branch 'feature/4.6-system-import' of https://github.com/Antare… #12703