Merge pull request #744 from jmaas/release24

Multiple fixes to the release24 branch