SC#QCADOOCLS-1045 mixpanel: merge latest @pili's changes into dev