Merge pull request #28 from jnugent/master

*8710* use parent handler