Merge "Allow type conversion from BufferStatus to int" into main