Added advanced search for self instruction
Merge branch 'upstream/master'
Fixed bug after merge
Merge branch 'master'