Auto805

Fix AUTO-805 and sub-tasks