fix FX-45,6,7,8
Merge branch 'master' of github.com:trungnh/magentoce1810