Issue #2235 was partially fixed (no flush periodic task).
Merge remote-tracking branch 'origin/develop' into develop