Combo TAP_CODE_DELAY
and clear_weak_mods
#15866
Merged
TAP_CODE_DELAY
and clear_weak_mods
#15866