I'd prefer not to merge in two chunks, if it's easier, feel free to close this PR and create a new one.