Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'