Importing patches from indigo release branch