Polled from branch_1_1 fix for bug #348