merge new fixes