Per Artem - PR to resolve link block issues