Merge branch 'mb/relnotes-1.8.5-fix'