Auto785

Fix AUTO-785