Merge "Use OperationsHistory from models"