PIN Handling | v3.8.x