merge selected changes from 'branches/diogenes-newplugins':