Merge pull request #5714 from alexischr/update_bockbuild