FX-50: Fix bugs
Merge branch 'master' of github.com:trungnh/magentoce1810