Merge "Use max acquired buffer setting to configStore"