Panel: more work on panel links, #1041