RPC and script update

Change-Id: I7767a5d90ade729451763974cdcea5b5c1e8cac1