[#870] 2.5.1 Bujumbura hotfix