[#883208] Added generic handling for production.