Take out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com...