updated to match master branch of spree frontend