[OE-5245] more disorder changes