Merge into one Sheer branch to rule them all