Merge "Add the error dialogs" into main