newTrunk-2280 Changes applied

I have applied the changes as mentioned.