Bug #6252
Merge branch 'master' into pinauthintegration