Merge alternate branch 'bug-1190' by magu into bug-1190