Trunk2280 changes 

These are the latest changes for the ticket Trunk-2280.