#1856: #1823: NJR QC fixes 4

opened by thuchacz