New upstream 12.0-SNAPSHOT