US538: interim commit while fixing tests