Merge branch 'f.dist' into d
add doc indexer
sort explicitlly
refactor doc indexer