Merge "Improve dialog popup" into main