#1836: #1823: eighth batch

opened by thuchacz