Fixes too many flush from versionning and PIM-2916