v 2.1 merging with 2.0 enhancements for library projects