#GT-1053: link creation fixed