Merge branch 'jc/gitlink' into next