Trunk 2779

This is the requested pull request from a specific branch for this ticket.