Update in line with up coming Workshop4 4.1.0.30