4.1.1-stable
bd6af8e0 · Merge pull request #79576 from YuriSizov/4.1-cherrypicks ·