Push changes to master

Esser, Haydenrequested to merge
develop into master

Push improve_clarity changes upstream to master

Merge request reports