fixes in buffer_stubborn
Merge remote-tracking branch 'origin/master' into cmake