Merge "Update PinnedPositions API (2/2)"