Merge "add modeling genericparser"