Issue #2381549 by sylus: Linkit Improvements