NoA provider stub
Merge remote-tracking branch 'origin/archDev' into archDev