Merge "Added an event before clearning user journey" into rvc-dev