Merge "Increase fallbacks counter when comparison result is different" into tm-dev