feature #3366: create context data with the same format as the core
Merge branch 'feature-3366' into one-4.10