Library and path updates, Small fixes
Merge branch 'refs/heads/7.x-2.x-dev' into 7.x-2.x