Merge branch 'chore/context-cleanups' into 'develop'