Merge "Remove the backlink resolves to same app check" into main