Merge "Convert the pose buffer into a more generic named buffer" into oc-dev