Fix reporting message deletion/change failures.
Merge branch 'master' into nag_4_2