Apply changes to N4071 in preparation for post-Rapperswil mailing