upgrade context message notation
finialize context notation 2
Merge branch 'feature/context_notation_2' into develop