Minion behavior improvements
Merge branch 'pim'