Merge "Add more error logging for DISMISS" into main