Backport fc6df49
Merge pull request #948 from Kondou-ger/backport_fc6df49

Backport fc6df49