XCOMMONS-600: Panel broken after an upgrade

(cherry picked from commit 8219e33fdc582d1b24e8c0752d44c697b1f2a55c)