Merge branch 'master' into Instance-Based-Framework-Provider
Fixed build issue when building in release mode
Merge branch 'Instance-Based-Framework-Provider' into version-2