Merge fix for model binding