SVY-6929 added flush()
Merge remote-tracking branch 'origin/master' into SVY-6929