Minion debug code
Merge branch 'pim'