Merge remote-tracking branch 'meskio/feature/put_key_ascii' into develop