#1859: #1823: NJR QC fixes 7

opened by thuchacz