PG Herveou
authored
#7463 follow up with RPC fixes
---------
Co-authored-by: 
cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> #7463 follow up with RPC fixes
---------
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>