Auto571

Fix AUTO-571 and sub-tasks AUTO-765 & AUTO-766