Merge "Fix for incorrect model version info"