LPS-44833 Use current target for link delegated click
LPS-44833 Source formatting
Merge branch 'surface' into master-deprecated-surface