Merge "DO NOT MERGE SF: Fix releaseBufferEndpoint merge issue" into sc-v2-dev