Merge "Remove SessionLink"