Merge branch 'pr/1395'