Workaround for #4232
Merge branch 'release' into upstream