Merge "Clean up dirFlags / bidiFlags confusion"