#1853: #1823: NJR QC fixes 1

opened by thuchacz