Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8' * commit 'd322d16323176ddd5fef3383798176f64d0078c8': fix a race in SF buffer management
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8' * commit 'd322d16323176ddd5fef3383798176f64d0078c8': fix a race in SF buffer management