Additional debug hooks @wip

Task 11289