Merge branch 'kill_avs'