[Completes #68884384] User views beta message in a popup view
fixing merge conflicts