[frogr/f18] New upstream version