Merge branch 'new-jex-import' (reverted from commit 31f93ab4bee357abce1ff0cc02bb71f172aff1c3)