deactivated temporarily the NONBE part of this MR to check the pipeline results