Merge "Adjust preference alignment."