Merge in 'view-reminders'

Please merge in branch 'view-reminders' into 'master'