AVUtils Code Review Fixes
Merge remote-tracking branch 'HomagePrototypeRepo/master'