Backport #5391: Please backport r33368, r33379 (ref #5380)

• Status: Closed
• Assignee: -

[nagachika (Tomoyuki Chikanaga)]

Please backport r33368, r33379 (ref #5380).
Especially r33368 is fix for SEGV introduced at 1.9.3.

[kosaki (Motohiro KOSAKI)]

• Status changed from Open to Closed

Done.

r33432, r33433 and r33434.