Merge last changes from upstream