2Q Cache flush optimization
Merge remote-tracking branch 'remotes/enisher-orinet/master'