Add Fix for keyType
Merge branch 'bugfix/keyType' into develop