Merge "Disable fallback when comparison result is different" into tm-dev