Merge branch 'daniel/issue1945'