TESB-14444 DataService does not use selected context