Merge pull request #3228 from annda/externallink-getter