Bug #6118
Content #6103
Bug #6125
#6095 and #6116
Bug #6126
Merge branch 'master' into pinauthintegration