#2 WindowSearch and MetaSearch added
#2 merge conflicts resolved