Merge "fix(rss): fix build issues with comms protocol" into integration