[#531] [#2790] Add a Context data map scoped to the current subquery