[PATCH 0/6] Fix current CI failures and document behaviour