Assembly Version matches nuget package
File version matches nuget packages
Merging branches
Merge branch 'dev-merge'