Manually merged my earlier commits with upstream