Undo previous update
Merge branch 'next' into coverage

Conflicts:
	cmake_modules/ci_utils.cmake