Fir workers refactored
Retriable exception added
Merge remote-tracking branch 'origin/develop' into develop