Merge branch 'jc/cc-ld-dynpath'