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