Change CondAlg to not re-entrant part IV
continuation of !54140 (merged)
ping @fwinkl @tsulaia see also discussion in ATEAM 836