[PATCH conductor] BZ831577 - Fixed regression introduced by 796528