Are there plans for other RPC attributes beyond [ClientRpc]

I've been trying to convert a project to the new networking and one thing that surprised me was the continued limitations of the RPC system. Specifically, that RPCs (and SyncEvents) are never called on the server, unless it happens to also be a localhost. This leads to a lot of cut'n'paste code or multi-level function calls where behavior that you want to happen on both the server and the client is repeated.

Are there plans to expand the RPC attributes to include the other two common cases?...

Are there plans for other RPC attributes beyond [ClientRpc]