merge ocs-rb with ocs-rb-core