intermediate commit, with too many debug printouts
Authored by: vsp_nagel 2013-12-09
Parent: [r27102]
Child: [r27104]