add sevice policy
Merge remote-tracking branch 'remote/dev' into dev