Sidekiq/Faye Fixes [ci skip]