Merge bug25517
Magic call handler to debug the state.
Less magic, more essay.
Move to near the other system message and simplify.
Tiny test
cosmetic
merge bug25513 into default