Merge pull request #836 from micmac1/dahli-6