Merge "Fix disable2 bug" into nyc-dev