Merge branch 'master' into feature/add_context_support