Update #1716 (march 1, 2020)

.