2021-02-01 - releng
16:04	<dpifke>	Cherry-picking https://gerrit.wikimedia.org/r/c/mediawiki/core/+/660063 in beta.	[releng]