Merge branch 'proxAvoidance' into otherAvoidance