2.0.4
7aa44d8e · 3433432: Manual fixes suggested by upgrade_status ·