Stops propagation of the target link
Stops propagation of the target link
Merge branch 'CDB-1865' into develop

* CDB-1865:
  Stops propagation of the target link
  Stops propagation of the target link