#5394 and #4567
Merge branch 'master' into pinauthintegration