Issue 6557: pass true to getPanel
Issue 6557: Some code improvements after 580f022