Feature apv neu

Merge