Auto813

fix AUTO-805 and subtasks: AUTO-813 & AUTO-814