Update even more missing commits from May9-10th