Issue #2371145: Some update functions can't be run when the module is disabled
Merge branch 'Issue-2371145' into develop