move link creation back into main method
Merge branch 'release/1.2.34'