Linking improvments

Patryk Kazimierowskirequested to merge
linking-improvments into release/1.7.1

Merge request reports