merging R5 hotfix changes
merging typo that caused bad link handling
merging hotfix changes for R5