https://opencart.atlassian.net/browse/OC-1828