Auto791

Fix AUTO-791 and sub-tasks AUTO-848 & AUTO-849