Merge pull request #1222 from jmaas/release26

Multiple regressions fixed