[#870] Bujumbura Hotfix v2.5.1