Issue #20649:multiple enhancements, convert to embedded windows