Merge pull request #757 from fabro-sh/fireworks-412-failover