https://github.com/opencart/opencart/issues/2057
https://github.com/opencart/opencart/issues/2062
Merge remote-tracking branch 'upstream/master'