Data Loss Bugfix in maintenance-3.x