Auto660

Fix AUTO-660 and sub-tasks