Merge branch 'pr/1469'