Hopefully re-add treatment after tasks are approved
Cleaning around approval improvements
Merge branch 'gh-1459' into staging