I am sure the simple approach should work, let's try it in 1.24 Follow #29834 and #29841
KeyID
db.DefaultContext