Merge "Disable comparison in user release builds" into tm-dev