Fixed Beceem library/firmware 354 merge