Merge branch 'bugzilla-102904-workaround' into release