ocs_roaming merge