Merge "Add extended metadata buffer support by defining different types of metadata buffers"