backport of #3433
Merge pull request #3437 from jerrinot/fix/dataloss/maintanance-3.x

backport of #3433