Added code to look up AVUs in different ways.
Merge remote-tracking branch 'remotes/origin/dev'