- Simplify code. - Loose the condition of success. - Add some missing tests. - Close newly opened windows gracefully. CORE-17351, CORE-16898, CORE-17612