Merge "Fixed auto confirm pin not working" into main