#1826: #1823: second batch
opened by thuchacz