Merge "Simplify some of the logic." into oc-dev