Merge remote branch 'origin/release' into qa
Fixing minor bug in opal manager
Merge remote branch 'origin/qa' into release