Feature/zen 11926

Do we really need to import everything?