Added feature file of 30634
fixing conflicts