Match Bitstream changes of gluegen commit 4447232af0d95a4348d09d4ed03fbef48394ca3a