fixed key gen, 2. try
Merge remote-tracking branch 'origin/dev' into dev