Merge "Refactor function signatures to remove mocked IRPC" into main