Auto720

Fix AUTO-720 and AUTO-721