Merge "Added support shared configuration"