Don't fail on missing user key
Merge branch '2.2.x_2.9' into 2.2.x_2.10