lib updates
Merge pull request #7416 from daltoniam/master

lib updates