Merge branch 'westmann/issue456'