ARQ-1657 Consistent usage of @OperateOnDeployment