#1835: #1823: seventh batch

opened by thuchacz