Merge branch 'opal-1.11.x'