Merge branch 'pr/846'