Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev