Merge branch '2776_dir_selection_fix'