Merge "Always perform has code check" into nyc-dev