panel-upgrade1846 (Orval Myres)

Following