Sync with the official GA
Modified to work !