Update from upstream

@gergo-debreczeni: Take a look