Merge branch 'ready/autoindex-autofile' into HEAD