Merge "Correcting message-router topic seeding"