Merge branch 'latest_upstream_tag_branch' into 944-update_with_upstream