New upstream with gi based gobject support