XCOMMONS-600: Panel broken after an upgrade