Merge "Add auxiliary message for window" into devel/master