Update followup_status to nil if the permission is set to Admin or User
Fix conflicts after merging MH-962 to dev