#1857: #1823: NJR QC fixes 5

opened by thuchacz