merge revision(s) bb180b87b43c45e17ff49735a26d7a188d5c8396: [Backport #21331]
[Bug #21331] Prohibit modification during stlike loop
merge revision(s) bb180b87b43c45e17ff49735a26d7a188d5c8396: [Backport #21331]