Add create access context consistently

Here I think I've covered all places.

I am also willing to create this patch for 1.x if you are willing to merge

In mean time I've created matching 1.x patch, I think it can be applied to as this does not harm anything