Merge "(Automated Tests) Changes after Window changes in Adaptor" into devel/master