Auto691

Fix AUTO-691 and AUTO-855