Merge "Add root flag correctly." into nyc-dev