BHV-12661: update delegated fucntion handle routine
Merge pull request #827 from enyojs/BHV-12661-SungbaeCho

BHV-12661: update delegated fucntion handle routine