TDQ-9238: fix some issue for ananlysis which use context in analysis
editor.
Merge branch 'master' into prototype/joint_er