Importing patches from groovy release branch