slightly different heuristics, trace levels adapted
Authored by: stefan_ratschan 2013-11-29
Parent: [r302]
Child: [r304]
