Merge branch 'latest_upstream_tag_branch' into 524-update_with_upstream_v6.100