sync rpc.php with upstream