Merge "Add all-named-(dirs|files)-under and related"