Fixed numerous tests failing in Opera due to #9507.
Merge branch 't/10098'