Merge branch 'fix-target_link_libraries-wrong-dir' into release