Better use of inherited panels
Merge remote branch 'upstream/development' into europnet