Merge branch 'rxkad-kdf-master' into HEAD