Merge branch 'bug-1192' into release