Merge branch 'pr-1773'