added changes from lib and nightly