Merge branch 'jeffbolznv-memory_scope_semantics'