Fixing merge issues and testing issues
Rufus Scheduler working for product status