catch up with 2.8.2.3

Charlotte Hausmanrequested to merge
catchup into 2.8.3-DEVELOPMENT

pull in recent changes from 2.8.2.3

Merge request reports