Merge "Update verifications depending on a missing #equals()" into tm-dev