#1802: #1774: third sweep

opened by thuchacz