E:42662 [*] Small logic changes
Merge branch '1.1.x' of github.com:litecommerce/core into 1.1.x