Auto925

Fix AUTO-925 and AUTO-817