merged buffering writes patch
merge with master conf.xml