Merge remote-tracking branch 'origin/alindima/refactor-availability-recovery-strategies' into alindima/add-systematic-chunks-av-recovery