IGOR NEXT and KATRIN NOA