Merge "Add a bugfix feature for roaming notification" into main