Merge "Adapt to addition of extension panel ordering"