Trunk 4011 amended

Updating ticket with latest review comments