Merge "NN validation tests" into pi-dev