- link fix for gcc
Merge commit '3e9e9afe0cc9bbb25d64fb467abf6b370357f7ff'