Merge "BUG2608: Using the right buffer id for no buffer"