Merge branch '3810_keep_panelization'