Sync changes from spree/spree:frontend up to 3d99f8c.