DDC-2871 PreFlush event called multiple times in event manager.
Merge remote-tracking branch 'origin/bugfix/DDC-2871' into strate-master