[Bug 225301] New: Merge Review: automake17