support spree master and 2-2-stable change in structure