Use the correct instance / field
Merge branch 'fix_report_user'
Merge branch 'master' into skin_rearrangement