Revert "Revert "CHG: FloatingOrigin tweaks.""

This reverts commit 7d3f3a6802d7ba5d67e7ff35f98ca19ebc33734c.