Merge branch 'pr/1792'