Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev