This is a combination of 2 commits.

dbug util

rebase