Feature/instoresearch dev merge irishflute dev