Merge from vendor branch AWK: