merge changes from HEAD for official 3.3 bootcd