Merge pull request #5620 from mono/bump-bockbuild