Feature/2475 implement kdf 2