[BUGFIX] Ensure updateComponent
is fired consistently
#18387
Merged
updateComponent
is fired consistently
#18387