Project libraries update

Re creating the PR for #810, because it was removed from master by #810