Merge "Fixed whitelistManager assignment." into nyc-dev