Merge "Change metatrace buffer index" into main