CBLT-82:  more debug info

Change-Id: Iab7dd4414e6e6f43fc768ea0afb9bc8d8a19ef32