Merge "Respond to API feedback on DIRECTORY columns."