Auto897

Fix AUTO-897 and sub-tasks AUTO-909, AUTO-910, AUTO-911