Merge "Fix anti falsing detection" into nyc-dev