#1806: #1777: third pass

opened by thuchacz