SOFTHSM-104: Inconsistencies between v1 and v2