Merge "[Feature] Tests are wrongly assigned to another DUT with same board but different model" into main