Sync with upstream

Please sync with upstream as you branch does not compile anymore :)