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