Merge "Prevent flushing issues when clearing a bo if there is a cache in use"