Merge "fix code smell in model-impl"