[#71883734] status was not updating correctly
Merge remote-tracking branch 'origin/master' into 71883734-mailing.export