Issue #2249723 by andrei.dincu: Change getter and setter name for context field