Rebased/dev 4 4/cli importer qa report dev 4 4

Forward PR #1336 from `dev_4_4` to `develop`.