Aterron/merge from oc

Latest fixes