Panel nastiness
Merge remote-tracking branch 'origin/dev.dms' into dev.gab