Merge branch 'latest_upstream_tag_branch' into epic23-update_with_upstream