Adds put/get terminology and returns uid for put.
Merge branch 'get_put_terminology' into develop