Merge "Only register debug hooks when requested"