Merge "More finishing-up of cluster implementation" into oc-dev