Merge "Required change for the new model drop"