[bmx6] update to master-tip 8b0585e