Merge "The return and fixing of demo mode" into nyc-dev