#1832: #1823: fourth batch

opened by thuchacz