Fixed dead lock during SBTree flush
Merge remote-tracking branch 'nuvolabase/develop' into develop