Merge pull request #813 from jmaas/release24

several fixes