#1794: #1772: third pass

opened by thuchacz