Merge branch 'bug-1118' into release