Instoresearch dev merge jewsharp dev