Merge "Adjust Gainsight configuration"