[OE-4006] - tmp commit, current management plan in progress