This isn't advanced, just adding to get custom manipulator branch from being too much out of sync with 2.8.