Data context lifetime fix
Merge remote-tracking branch 'origin/master' into Accessors
mapping, б####ь