Merge branch 'staging'
Fix key.id to be null if does not exist
Merge pull request #153 from mistio/frontend_key_id_fix

Frontend key id fix