Merge "Fixing incomplete RemoteAction clone" into pi-dev