Added dev mode handling back to build