include parentContext and query in next context
1.3.0