4803.   [bug]		Backport parts of RT #45293 and RT #46267, specifically
			the fix for RT #46055 and mkeys system test
			improvements. [RT #46430]

9.11.3, 9.10.7, 9.9.12