Merge "Make linkshere-related messages backward compatible"