Merge branch 'pr/1975'