MDL-24383 adding missing context setup - credit goes to Paul Ortman