1.1 backports #1044

Job	Run time
linter	2m 17s
linter_gui	3m 40s
unit_tests (1.48, ubuntu-latest)	3m 57s
unit_tests (1.48, macOS-latest)	21s
unit_tests (1.48, windows-latest)	4m 16s
unit_tests (nightly, ubuntu-latest)	1m 37s
unit_tests (nightly, macOS-latest)	2m 1s
unit_tests (nightly, windows-latest)	2m 34s
unit_tests_gui (1.65, ubuntu-latest)	5m 34s
unit_tests_gui (1.65, macOS-latest)	7m 21s
unit_tests_gui (1.65, windows-latest)	7m 26s
unit_tests_gui (nightly, ubuntu-latest)	3m 32s
unit_tests_gui (nightly, macOS-latest)	4m 32s
unit_tests_gui (nightly, windows-latest)	5m 12s
	54m 20s

Provide feedback