Apply changes from ST-0017.#1359

grynspan merged 6 commits intomainswiftlang/swift-testing:mainfrom

jgrynspan/image-attachment-adjustmentsswiftlang/swift-testing:jgrynspan/image-attachment-adjustmentsCopy head branch name to clipboard