IDEX-1275: Used Links.createLinks direct