Update #1696 (march 18, 2020)

.