merged adri1 master noa-1