#107824 follow up by myself: ensure that the newly added updates are in the 6.x-extra group and not disguised as 5.x to 6.x updates