Merge branch 'jh/close-index-before-stat' into maint