#1855: #1823: NJR QC fixes 3

opened by thuchacz