fixed merge of branch feature/autogenerated_info_windows into master