Merge branch 'pr/1033'