Fix package integration
Merge changes from master
Fix angular package references