PIN Handling | v3.5.x