Merge lib changes from Providence