Merge branch 'fix-247-wip' into eask-tests #339

Job	Run time
Build and test (24.4)	24s
Build and test (24.5)	30s
Build and test (25.1)	25s
Build and test (25.2)	25s
Build and test (25.3)	27s
Build and test (26.1)	26s
Build and test (26.2)	29s
Build and test (26.3)	26s
Build and test (27.1)	27s
Build and test (28.1)	25s
Build and test (28.2)	30s
Build and test (29.1)	26s
Build and test (29.2)	41s
Build and test (29.3)	37s
Build and test (29.4)	38s
Build and test (release-snapshot)	35s
Build and test (snapshot)	28s
	8m 19s

Provide feedback