Merge "Don't die if dirKey hasn't been set in Selection." into nyc-dev