Merge branch 'pr1107'