Fix reconstruction of identity keys.
Merge branch 'develop' into bip44