Merge "Adding blocking to DirectoryLoader when Band Selection is active." into nyc-andromeda-dev