Merge "add scenario models and framework"