Implement changes from the library build 18