Added advanced search for self instruction
Merge branch 'upstream/master'