[DEV][TASK 8995] Finish Scenarios 1 and 2