Merge "v3 keys use SP800 derivation" into pi-dev