Merge "Bitstream debug tool" into nextgenv2