[PATCH conductor] BZ 790860 - improved availability checking