#20827 Added more debug info