Merge remote-tracking branch 'origin/feature/10718_add_bkgdsmooth_gui'
merge in master to solve ui conflict re #10772
Merge branch 'feature/10772_OptOut_usage_stats' into develop