Merge branch 'Development'
Merge branch 'Development'
When a value is null, it now also uses the HasStrategy
Merge branch 'master' into Development