Merge "remove deprecated bp 'subdirs'"