Skip to content

WPF refactoring

WPF refactoring #1848