merge with commercial server (ocs_admin scripts)