#1825: #1823: first batch

opened by thuchacz