[PATCH conductor] BZ 804620 for master branch