Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev