Fixed bugs and docs in TargetProxy logic
Merge branch 'ava' into development