Osp svc and client changes