Merge branch 'develop'
Important bug fix.

Merge branch 'develop'
Important bug fix for KValue keys.

Merge branch 'develop'
Fixed strings
Merge branch 'master' into develop