NXP-12688 Adapt to new Operations moving in Automation