Sync with master.
Fix nocommit. Flush needed to be for single index.