Merge "Check window validity" into devel/master