Merge "Expose server name in rc feed"