Merge "Make the fallback nature of message text clear from the docs." into main