Merge pull request #1071 from TDT-GmbH/add-force-link-option