Merge "Fixed bug when RPC was not propagared"