Null merge 3.1 (fix already applied: 4a82be47a948+5060a92a8597).