backport changes from V00-23-XX
Merge pull request #94 from smuzaffar/V00-22-XX

backport changes from V00-23-XX