Merge branch 'bug-1112' by INOPIAE into bug-1112