LPS-41931 global links 2

Hi @matethurzo,

I rebased with master. Hope now the test pass...