newTrunk-2280 Changes applied