[sr-dev] git:master:7a357300: core: rpc - removed old todo, whitespacing and define guards coherence