Pinauthintegration - merge with master