Merge branch 'bugfix-3.9.2'