Merge pull request #812 from jmaas/release26

multiple fixes