SOC-4244: Apply new constraints