Merge "Resurrect the pose tool." into oc-dr1-dev