merge revision(s) 931ac960b6d11937364b6c4e847fdd575ee67980: [Backport #21159]
[Bug #21159] module names should not be modifiable
merge revision(s) 931ac960b6d11937364b6c4e847fdd575ee67980: [Backport #21159]