OC-4 Lustiger commit