disable debug output and include bond cost as well
(cherry picked from commit 9ea86965c57a58c2871ba410fd44b86b008cf2c5)