Merge branch '2669_broken_dir_reload'