Merge: lib-src changes mostly to avoid GCC warnings