Merge remote branch 'origin/qa' into release
Fixing bug in user view showing other service site's access
Merge remote branch 'origin/release' into qa