rebase/rerebase fixed (#4539)
rebase/rerebase fixed (#4539)

simonmichael/stackage,mstksg/stackage,spencerjanssen/stackage,massysett/stackage,stackbuilders/stackage,michalkonecny/stackage,soenkehahn/stackage,Daniel-Diaz/stackage,fimad/stackage,mrkkrp/stackage,asr/stackage,clinty/stackage,wereHamster/stackage,jonschoning/stackage,athanclark/stackage,iand675/stackage,int-index/stackage,fpco/stackage