Merge "Remove the linked reference and deprecated keyword" into main