UPGRADE note related to #2053.