Merge branch 'release-2.4' into develop
Fix Gremlinq project in solution configuration
Merge branch 'develop'