Merge forward from release/1.7.0#324

glessard merged 2 commits into

mainapple/swift-system:mainfrom

dev/mergeback-1.7.xapple/swift-system:dev/mergeback-1.7.xCopy head branch name to clipboard