Merge "Updated scenario documentation"