Merge "Window - Constructor refactor." into devel/master