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