Merge branch 'rs/apply-name-terminate'