[PATCH conductor 0/1] #787280 - Get rid of fake links