Feature/instoresearch merg emaster