[SerialICE] Patch merged into serialice/master: Cleanup on walk_pre_hooks