24519 Added Linkit support