Merge branch 'release-2.4'
Merge branch 'develop'
Fix nuspec
Remove version from Nuspec
Set Version to 2.3.6 in Nuspec