Merged with upstream
S2716_pull_request_reorganization_#1
Merge branch 'master' into S2716_pull_request_reorganization_#1