#1834: #1823: sixth batch

opened by thuchacz