do not give up as soon as a key is missing
Merge branch '2.2.x+collect' into 2.2.x+extra