Merge tag 'fix-missing-panels' into fixes