Added a more abstract definition of tmp
Merge branch 'master' into oc_merge