Merge branch '3687_hotlist_in_data_dir'