Backport from V00-21-XX
Merge pull request #52 from ktf/backport-22

Backport from V00-21-XX