v7: backport #1338 #2433

Job	Run time
linter_gui	1m 59s
linter	33s
unit_tests (1.63, ubuntu-latest)	3m 10s
unit_tests (1.63, macOS-latest)	2m 57s
unit_tests (1.63, windows-latest)	4m 22s
unit_tests (nightly, ubuntu-latest)	59s
unit_tests (nightly, macOS-latest)	3h 5m 15s
unit_tests (nightly, windows-latest)	2m 12s
unit_tests_gui (1.70.0, ubuntu-latest)	4m 21s
unit_tests_gui (1.70.0, macOS-latest)	3m 3s
unit_tests_gui (1.70.0, windows-latest)	6m 22s
unit_tests_gui (nightly, ubuntu-latest)	3m 16s
unit_tests_gui (nightly, macOS-latest)	3m 36s
unit_tests_gui (nightly, windows-latest)	6m 7s
	3h 48m 12s

Provide feedback