Merge "Revert "Revert "Add "incrementEventCountBy" function to Onboardi..."" into tm-dev