Merge branch 'ss/doclinks'