Update #1709 (march 8, 2020)

.