Merge branch '69_fix_install' into prod #69
Merge branch '70_fix_pro_eco_import' into prod #70