merge lib-common changes from development branch