pull from 1.4 to master

finale version of panel