Merge branch 'pr/1918'