Merge "blind writes" workaround from release into master