Hand pick commits from matje