Merge branch 'daniel/issue1986'