merge changes to diogenes.postrm