Updated assemby manifests
Merge branch 'dev'