[OE-4006] -  current management plan more more form changes