Merge last updates from the original repo