I can copy my branch onto Xaria's to see if it works with Xaria's fix
git checkout -b topic-whatif
git rebase xarias-branch
