Merging next to In-app-analytics-SOAP-2335: SOAP-2335