Working commit of latest RPC changes