merge ocs-rb with ocs-rb-core
merge ocs-rb with ocs-rb-core