#1858: #1823: NJR QC fixes 6

opened by thuchacz