Merge "Modifying HwKey::deriveKey parameter" into main