oc_id 0.4.2
Merge branch 'jc/oc_id-0.4.2'