#5948
Merge branch 'master' into pinauthintegration