Merging ADI-version of VAP into master. This removes all use of old BW-ADI version and is now full fledge ADI!