Feature/instoresearch dev merge jewsharp dev