Updated more changes from funnel schedule
Merge conflict