#1833: #1823: fifth batch

opened by thuchacz