Merge "Change to use correct check for halfpel"