Adds more logging to the HAM support.
Merge commit 'd40f376a1da7ffb0ec6ef22230135f403684d2fc' into HEAD