fix issue6811

Merged Pierre-Yves David requested to merge topic/stable/split-data-loss into branch/stable

Merge request reports