Update #1593 (April 2, 2020)