ticket #2405: merge tools_trunk_ticket2405 into it (merge trigger conflict because of Tree conflict on maketools)