forked release to add stacking support