Construct X-1288 - links

Construct X-1288