Merge "Adding debug mode for scrims"