Merge "Prompt user to add data on mobile portals" into main