Better support for https asset conversion on checkout page

Issue #1836