Merge pull request #24232 from janvorli/fix-large-version-bubble-2