manual merge and backport of pull #20 adding an accounting role