Issue #20649:multiple enhancements, convert to embedded windows
Issue #20649:address John's comments
Merge pull request #64 from garyhgohoos/20649

Issue #20649:multiple enhancements, convert to embedded windows