resolve undo of 5360
remove disable spree FE cherry pick