Merge branch 'pr/1345'