#1789: #1769: second pass

opened by thuchacz