Fix xlink problem
Merge branch 'develop'