Merge "Get rid of dirFlags log spam"